[IA64] Removed warning messages

This patch removed warning messages in vcpu.c, xentime.c and xensetup.c.
I tested compilation, booting dom0, and creation/destruction domU.

Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>

diff --git a/xen/arch/ia64/xen/vcpu.c b/xen/arch/ia64/xen/vcpu.c
index 763be05fee550a954b2b2bd76b024cb98a864177..028660e6347d9fd5f3295fdff74b5590b46be589 100644 (file)
--- a/xen/arch/ia64/xen/vcpu.c
+++ b/xen/arch/ia64/xen/vcpu.c
@@ -74,6 +74,7 @@ vcpu_get_gr(VCPU *vcpu, unsigned long reg)
 {
        REGS *regs = vcpu_regs(vcpu);
        UINT64 val;
+
        if (!reg) return 0;
        getreg(reg,&val,0,regs);        // FIXME: handle NATs later
        return val;
@@ -82,10 +83,11 @@ IA64FAULT
 vcpu_get_gr_nat(VCPU *vcpu, unsigned long reg, UINT64 *val)
 {
        REGS *regs = vcpu_regs(vcpu);
-    int nat;
+       int nat;
+
        getreg(reg,val,&nat,regs);      // FIXME: handle NATs later
-    if(nat)
-        return IA64_NAT_CONSUMPTION_VECTOR;
+       if (nat)
+               return IA64_NAT_CONSUMPTION_VECTOR;
        return 0;
 }
 
@@ -96,8 +98,10 @@ IA64FAULT
 vcpu_set_gr(VCPU *vcpu, unsigned long reg, UINT64 value, int nat)
 {
        REGS *regs = vcpu_regs(vcpu);
+       long sof;
+
        if (!reg) return IA64_ILLOP_FAULT;
-       long sof = (regs->cr_ifs) & 0x7f;
+       sof = (regs->cr_ifs) & 0x7f;
        if (reg >= sof + 32) return IA64_ILLOP_FAULT;
        setreg(reg,value,nat,regs);     // FIXME: handle NATs later
        return IA64_NO_FAULT;
@@ -1247,7 +1251,7 @@ IA64FAULT vcpu_thash(VCPU *vcpu, UINT64 vadr, UINT64 *pval)
        UINT64 VHPT_addr2a =
                ((pta_base >> 15) & 0x3fffffffffff) & compMask_60_15;
        UINT64 VHPT_addr2b =
-               ((VHPT_offset >> 15) & 0x3fffffffffff) & Mask_60_15;;
+               ((VHPT_offset >> 15) & 0x3fffffffffff) & Mask_60_15;
        UINT64 VHPT_addr3 = VHPT_offset & 0x7fff;
        UINT64 VHPT_addr = VHPT_addr1 | ((VHPT_addr2a | VHPT_addr2b) << 15) |
                        VHPT_addr3;

diff --git a/xen/arch/ia64/xen/xensetup.c b/xen/arch/ia64/xen/xensetup.c
index 89c2a350fc1045b8fb4ff13e52ab7357dbdec71b..00e7bb8079300e7d6dcdbc9d5f785bf375b66f0a 100644 (file)
--- a/xen/arch/ia64/xen/xensetup.c
+++ b/xen/arch/ia64/xen/xensetup.c
@@ -168,6 +168,9 @@ void start_kernel(void)
     unsigned long dom0_initrd_start, dom0_initrd_size;
     unsigned long initial_images_start, initial_images_end;
     struct domain *idle_domain;
+#ifdef CONFIG_SMP
+    int i;
+#endif
 
     running_on_sim = is_platform_hp_ski();
     /* Kernel may be relocated by EFI loader */
@@ -311,8 +314,6 @@ printk("About to call timer_init()\n");
 #endif
 
 #ifdef CONFIG_SMP
-    int i;
-
     if ( opt_nosmp )
     {
         max_cpus = 0;

diff --git a/xen/arch/ia64/xen/xentime.c b/xen/arch/ia64/xen/xentime.c
index 5f6a0ebd4ad677133831906c243084337b805a16..af784f7f06dca2ea84690ac82568b948493a0820 100644 (file)
--- a/xen/arch/ia64/xen/xentime.c
+++ b/xen/arch/ia64/xen/xentime.c
@@ -29,6 +29,7 @@
 #include <asm/vcpu.h>
 #include <linux/jiffies.h>     // not included by xen/sched.h
 #include <xen/softirq.h>
+#include <xen/event.h>
 
 /* FIXME: where these declarations should be there ? */
 extern void ia64_init_itm(void);